Looking at and merging differences between two file versions

In this section, you will learn how you can use the Diff/Merge tool to show and merge differences between files and versions of files.
You can open a Diff/Merge tool in the Project Editor, the Source Editor, or the Configuration Manager. For a detailed description of the Diff/Merge tool, please refer to Reference Guide --Diff/Merge tool.
Comparing file versions
You can look at the differences between two versions of a file in the Project Editor, the Source Editor, Documentation Editor, the Diff/Merge tool, or the Configuration Manager.
Here, we will use the Project Editor.
To look at the differences between two versions of a file:

Choose File > Show Differences....
The Differences dialog appears

2. In the Version Left field, enter one of the file versions to compare. Use the radio buttons if applicable (see below).
3. In the Version Right field, enter the other file version to compare. Use the radio buttons if applicable (see below).
4. Press Ok.
   SNiFF+ opens a Diff/Merge tool, in which the differences between both file versions are displayed. The Diff/Merge tool is shown on page 174.

Radio buttons
WORK--Refers to the version of the file you "see" in the working environment. This can either be a writable, local copy or the read-only original located in the shared working environment (usually the SSWE).
SHARED--Refers to the version of the file currently located in the shared working environment accessed by the working environment you are currently in. Usually, you are in your PWE, so the accessed shared working environment is your team's SSWE.
Default Configuration or File Version (here HEAD)--If a file version is selected in the Project's Editor History View, this radio button displays the version number. Otherwise, it displays the Default Configuration of the working environment you are currently in. Default Configurations are discussed on Default Configuration.

| Note
| If you select the SHARED radio button for the Version Right field, you must select WORK for the Version Left field.

Comparing file versions in the Diff/Merge tool
A Diff/Merge tool appears when you compare two file versions using the Show Differences... command from the File menu.

You can also use the Diff/Merge tool for editing files. In the figure above, the working file (file version

WORK ) is writable, so you can edit it and merge differences into it.